projects / xen.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4b82fa1 0ac7f11)
bitkeeper revision 1.29 (3e4ce07294MgHhL6FdnvhMOCv97X4w)
authorkaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk>
Fri, 14 Feb 2003 12:26:26 +0000 (12:26 +0000)
committerkaf24@labyrinth.cl.cam.ac.uk <kaf24@labyrinth.cl.cam.ac.uk>
Fri, 14 Feb 2003 12:26:26 +0000 (12:26 +0000)
Merge labyrinth.cl.cam.ac.uk:/usr/groups/xeno/BK/xeno
into labyrinth.cl.cam.ac.uk:/local/scratch/kaf24/xeno-sched

1  2 
.rootkeys patch | diff1 | diff2 | blob | history
xen-2.4.16/arch/i386/setup.c patch | diff1 | diff2 | blob | history
xen-2.4.16/common/domain.c patch | diff1 | diff2 | blob | history
xen-2.4.16/include/hypervisor-ifs/hypervisor-if.h patch | diff1 | diff2 | blob | history

diff --cc .rootkeys
Simple merge
diff --cc xen-2.4.16/arch/i386/setup.c
Simple merge
diff --cc xen-2.4.16/common/domain.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.